From 566a61fa41271cfeebce15cbd3e32619b7ded367 Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Mon, 27 Feb 2006 10:27:57 +0000 Subject: [PATCH] Fix non-xen build for: Move the gate page (vsyscall) out of the fixmap area into user address space, just below PAGE_OFFSET. From: Gerd Hoffmann Signed-off-by: Christian Limpach --- linux-2.6-xen-sparse/include/asm-i386/fixmap.h | 9 --------- linux-2.6-xen-sparse/include/asm-i386/page.h | 2 ++ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/linux-2.6-xen-sparse/include/asm-i386/fixmap.h b/linux-2.6-xen-sparse/include/asm-i386/fixmap.h index cfb1c61d3b..a2c73a7f2d 100644 --- a/linux-2.6-xen-sparse/include/asm-i386/fixmap.h +++ b/linux-2.6-xen-sparse/include/asm-i386/fixmap.h @@ -52,7 +52,6 @@ */ enum fixed_addresses { FIX_HOLE, - FIX_VSYSCALL, #ifdef CONFIG_X86_LOCAL_APIC FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */ #endif @@ -116,14 +115,6 @@ extern void __set_fixmap (enum fixed_addresses idx, #define __fix_to_virt(x) (FIXADDR_TOP - ((x) << PAGE_SHIFT)) #define __virt_to_fix(x) ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT) -/* - * This is the range that is readable by user mode, and things - * acting like user mode such as get_user_pages. - */ -#define FIXADDR_USER_START (__fix_to_virt(FIX_VSYSCALL)) -#define FIXADDR_USER_END (FIXADDR_USER_START + PAGE_SIZE) - - extern void __this_fixmap_does_not_exist(void); /* diff --git a/linux-2.6-xen-sparse/include/asm-i386/page.h b/linux-2.6-xen-sparse/include/asm-i386/page.h index 997ca5d178..db44078217 100644 --- a/linux-2.6-xen-sparse/include/asm-i386/page.h +++ b/linux-2.6-xen-sparse/include/asm-i386/page.h @@ -139,6 +139,8 @@ extern int page_is_ram(unsigned long pagenr); ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define __HAVE_ARCH_GATE_AREA 1 + #endif /* __KERNEL__ */ #include -- 2.30.2